Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 23:32:40 +0000 (23:32 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 23:32:40 +0000 (23:32 +0000)

Trivial merge